minor fixes, changed helper files, whitespace, no double readyState 1 events
diff --git a/XMLHttpRequest/abort-event-order.htm b/XMLHttpRequest/abort-event-order.htm index a7e7090..a2d6f69 100644 --- a/XMLHttpRequest/abort-event-order.htm +++ b/XMLHttpRequest/abort-event-order.htm
@@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[5]" /> + <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[5] following-sibling::ol/li[4]/ol/li[6] following-sibling::ol/li[4]/ol/li[7]/ol/li[3] following-sibling::ol/li[4]/ol/li[7]/ol/li[4]" /> <script src="/resources/testharness.js"></script> <title>XMLHttpRequest: The abort() method: abort and loadend events</title> </head>
diff --git a/XMLHttpRequest/abort-upload-event-abort.htm b/XMLHttpRequest/abort-upload-event-abort.htm index 2f7a682..97383ad 100644 --- a/XMLHttpRequest/abort-upload-event-abort.htm +++ b/XMLHttpRequest/abort-upload-event-abort.htm
@@ -1,9 +1,9 @@ <!DOCTYPE html> <html> <head> - <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" /> + <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[3]" /> <script src="/resources/testharness.js"></script> - <title>XMLHttpRequest L2: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object</title> + <title>XMLHttpRequest: The abort() method: Fire a progress event named abort on the XMLHttpRequestUpload object</title> </head> <body> @@ -12,38 +12,33 @@ <script type="text/javascript"> var test = async_test(); - test.step(function() + test.step(function() { var xhr = new XMLHttpRequest(); - var initialized = false; xhr.onreadystatechange = function() { - test.step(function() + test.step(function() { - if (xhr.readyState == 1) + if (xhr.readyState == 1) { - if (initialized) - { - xhr.abort(); - } - initialized = true; + xhr.abort(); } }); }; - xhr.upload.onabort = function(e) + xhr.upload.onabort = function(e) { test.step(function() { assert_true(e instanceof ProgressEvent); assert_equals(e.type, "abort"); assert_equals(e.target, xhr.upload); - test.done(); + test.done(); }); }; - xhr.open("POST", "./support/echo.php", true); + xhr.open("POST", "./resources/content.php", true); xhr.send("Test Message"); }); </script> diff --git a/XMLHttpRequest/abort-upload-event-loadend.htm b/XMLHttpRequest/abort-upload-event-loadend.htm index b469fcb..5de3450 100644 --- a/XMLHttpRequest/abort-upload-event-loadend.htm +++ b/XMLHttpRequest/abort-upload-event-loadend.htm
@@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" /> + <link rel="help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-abort()-method" data-tested-assertations="following-sibling::ol/li[4]/ol/li[7]/ol/li[4]" /> <script src="/resources/testharness.js"></script> <title>XMLHttpRequest L2: The abort() method: Fire a progress event named loadend on the XMLHttpRequestUpload object</title> </head> @@ -12,38 +12,33 @@ <script type="text/javascript"> var test = async_test(); - test.step(function() + test.step(function() { var xhr = new XMLHttpRequest(); - var initialized = false; xhr.onreadystatechange = function() { - test.step(function () + test.step(function () { - if (xhr.readyState == 1) + if (xhr.readyState == 1) { - if (initialized) - { - xhr.abort(); - } - initialized = true; + xhr.abort(); } }); }; - xhr.upload.onloadend = function(e) + xhr.upload.onloadend = function(e) { - test.step(function() + test.step(function() { assert_true(e instanceof ProgressEvent); assert_equals(e.type, "loadend"); assert_equals(e.target, xhr.upload); - test.done(); + test.done(); }); }; - xhr.open("POST", "./support/echo.php", true); + xhr.open("POST", "./resources/content.php", true); xhr.send("Test Message"); }); </script> diff --git a/XMLHttpRequest/response-data-arraybuffer.htm b/XMLHttpRequest/response-data-arraybuffer.htm index 90831da..9502964 100644 --- a/XMLHttpRequest/response-data-arraybuffer.htm +++ b/XMLHttpRequest/response-data-arraybuffer.htm
@@ -1,9 +1,9 @@ <!DOCTYPE html> <html> <head> - <link rel="Help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" /> + <link rel="Help" href="http://dvcs.w3.org/hg/xhr/raw-file/tip/Overview.html#the-response-attribute" data-tested-assertations="following::a[contains(@href,'#arraybuffer-response-entity-body')]/.." /> <script src="/resources/testharness.js"></script> - <title>XMLHttpRequest L2: The response attribute: ArrayBuffer data</title> + <title>XMLHttpRequest: The response attribute: ArrayBuffer data</title> </head> <body> @@ -16,11 +16,11 @@ { var xhr = new XMLHttpRequest(); - xhr.onreadystatechange = function() + xhr.onreadystatechange = function() { - if (xhr.readyState == 4) + if (xhr.readyState == 4) { - test.step(function() + test.step(function() { assert_equals(xhr.status, 200); @@ -40,7 +40,7 @@ } }; - xhr.open("GET", "./support/echo.php?content=Hello", true); + xhr.open("GET", "./resources/content.php?content=Hello", true); xhr.responseType = "arraybuffer"; xhr.send(); }); 